Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Fri, 30 Mar 2018 22:17:23 +0000 (18:17 -0400)
committerTom Rini <[email protected]>
Fri, 30 Mar 2018 22:17:23 +0000 (18:17 -0400)

Trivial merge